Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 2, 2025

The regex for finding the latest release (as a fallback when current is not in the file) had a bug. This caused the generated docs to be inserted at the wrong place in the file (the end of the file) instead of the top. This commit fixes the logic such that we find the last release when the current is not found.

Closes #17952


This is an automatic backport of pull request #18250 done by Mergify.

The regex for finding the latest release (as a fallback when current is not in
the file) had a bug. This caused the generated docs to be inserted at the wrong
place in the file (the end of the file) instead of the top. This commit fixes
the logic such that we find the last release when the current is not found.

(cherry picked from commit a3228e2)

# Conflicts:
#	tools/release/generate_release_notes_md.rb
@mergify mergify bot added backport conflicts Detected git conflicts labels Oct 2, 2025
Copy link
Contributor Author

mergify bot commented Oct 2, 2025

Cherry-pick of a3228e2 has failed:

On branch mergify/bp/8.18/pr-18250
Your branch is up to date with 'origin/8.18'.

You are currently cherry-picking commit a3228e2d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   tools/release/generate_release_notes_md.rb

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@elasticmachine
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

cc @donoghuc

@donoghuc
Copy link
Member

donoghuc commented Oct 2, 2025

Not vendoring this in 8.x

@donoghuc donoghuc closed this Oct 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts Detected git conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants